Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Wed, 18 Jul 2012 03:12:45 +0000 (11:12 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 18 Jul 2012 03:12:45 +0000 (11:12 +0800)
commitf30ecbfd21f3a82adab9bc6d7b293c9e5bb23863
treecfc2658798068ad13c0a66a71cfc6317dc57acdf
parentc381533d47b5b8f16ea7c6f29f0cc1afcdea02b6
parentab78f676b9218240a6e8b2265db3fbc98a896811
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/rtl818x/rtl8187/leds.c
arch/arm/kernel/smp.c
drivers/usb/serial/option.c
net/ipv6/route.c
net/wireless/reg.c