]> 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, 23 Sep 2011 03:30:33 +0000 (13:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:30:33 +0000 (13:30 +1000)
commitb9535358c8426c4ec1144384f61bb7835558ad20
treec2a48ce1529a65cc6b1ceeef2a4ccc730535e59b
parentb9e8aa5b58a732c4b40ab01e4198480d4dc0fe7c
parentf57ecebcaf1ea7afcd7d30533bd6ca2a67a21ae8
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