]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:27:26 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:27:26 +0000 (14:27 +1000)
commit6b007a1e96ef1479bd76a080f3c6f6b9d6f721d4
tree1e40780f99c536866b66566b009b9dd6206bc2be
parent9df739b57c6163c3919642337afdb7492861a118
parent7377fb86179b20d047614bd641273b4d7a38f4eb
Merge remote-tracking branch 'pm/linux-next'

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