]> 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, 31 Aug 2011 02:56:22 +0000 (12:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:56:22 +0000 (12:56 +1000)
commit74a0e751c972e2262d95ddf335b9f65fb7fc5d79
treeeca2dc11628c7ba18c007e42ff619467e2c95756
parentf49210833638e838a0adf970106f56342a8f42b2
parent350732c2c19070cf646c12ef2e60c9a46968b703
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
17 files changed:
arch/alpha/include/asm/thread_info.h
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/setup-sh7372.c
arch/s390/Kconfig
arch/s390/include/asm/thread_info.h
drivers/bluetooth/btusb.c
drivers/mfd/twl6030-irq.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/usb/core/hcd.c
fs/ext4/super.c
fs/gfs2/log.c
fs/gfs2/quota.c
include/linux/netdevice.h
net/mac80211/main.c
net/mac80211/mlme.c