Public Git Hosting - linux-2.6/next.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8641bd2 bed0340)

commit	ac8d45c94d3767260bddc9c6a6859d5331a322e2
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Aug 2011 03:30:02 +0000 (25 13:30 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Aug 2011 03:30:02 +0000 (25 13:30 +1000)
tree	72a37037a41a9d9739915f0b9044bbf891df0efe	tree \| snapshot (tar.gz zip)
parent	8641bd2bc1e0a9f047f58337ed1fd75a8e508dac	commit \| diff
parent	bed0340783c941c25691658e60b522bd1af89d58	commit \| diff

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

14 files changed:

arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh7372.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/btusb.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl6030-irq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	\|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/quota.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history

linux-next