]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 03:23:28 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 03:23:28 +0000 (14:23 +1100)
commitfdfa37bbd1d9d982ff1a5b965e70f01f6cafd938
treea7a49ad925275b59a8d0236b75c6ca27e7627756
parentf567bb2ed16b0b91ef2ee2ec600f552b634f67e5
parent0984fdc4de7aa6a33e2569e1bedf7cbb137fb121
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
18 files changed:
Documentation/kernel-parameters.txt
Documentation/power/basic-pm-debugging.txt
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/s390/Kconfig
drivers/bluetooth/btusb.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/usb/usbnet.c
include/linux/device.h
include/linux/netdevice.h
include/sound/pcm.h
kernel/Makefile
kernel/power/Kconfig
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/scan.c
sound/core/pcm_native.c
sound/usb/card.c