]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:04:07 +0000 (14:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:04:07 +0000 (14:04 +1000)
commitc734f5f3a23fba62d85b067d52fe0f6e8a7b6e83
tree8bc389a27da0ffb32b0513cbffdaad0efa80440e
parentc557310c53d48a3d9bcd90803f106e9854ba0f46
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
18 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
fs/xfs/xfs_buf.c
include/linux/netdevice.h
net/mac80211/main.c
net/mac80211/mlme.c