Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Mon, 21 Jan 2013 09:21:19 +0000 (17:21 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 21 Jan 2013 09:21:19 +0000 (17:21 +0800)
commit67450b3bb618e8f63e963f2182df33a19f863486
tree45028656d2716eb03114a6c1766e0e7f17c59f08
parenta32b669752a2bb322db431582e381d522bd0eaf0
parent0829a6cc39cfcd76caaf562b4254c95392463b62
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.59
Conflicts:
Makefile
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
drivers/usb/serial/option.c
drivers/usb/core/hub.c
drivers/usb/serial/option.c
include/linux/netlink.h
mm/page_alloc.c
net/ipv4/devinet.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/mac80211/sta_info.c