]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:15:19 +0000 (13:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:15:19 +0000 (13:15 +1000)
commit77410068b5a54786cc0537415a27ec1a44ead41c
tree419e469c090a68d5ef8feca0a4140d327a451db4
parenta7ddc18a534d663fe6852b738f45d58a2ff148fd
parenta5232e4d60e0100d2e2c5abba04054fc4a320e0c
Merge remote-tracking branch 'pm/linux-next'

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