]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:38:46 +0000 (12:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:38:46 +0000 (12:38 +1000)
commit08c74b7f75d0d176bd877ad31049b8d6b6145f92
tree1d4eb1fb0a28ae9df8895228b076e45538205f90
parent39013e04ee4f116b47ab47e95e6f121a48870cfc
parent14c5db44b2f3ea4d077a07de65398e46cfb63069
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
14 files changed:
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/netdevice.h
include/sound/pcm.h
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/scan.c
sound/core/pcm_native.c
sound/usb/card.c