]> 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, 19 Dec 2011 04:11:42 +0000 (15:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 04:11:42 +0000 (15:11 +1100)
commit44ba9c1b7ebaac09cff5545ced6fada3e9b18dfb
tree94d88e7cb472b782d8afca5dd8c4aafc21b0babc
parent851144a135181c0bd9248b70fae2f751043bee8a
parent086652c19b2d321ead9fc7216c70157efae16329
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
fs/xfs/xfs_buf.c
18 files changed:
Documentation/feature-removal-schedule.txt
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/pm.c
arch/m68k/include/asm/thread_info.h
fs/btrfs/async-thread.c
fs/btrfs/disk-io.c
fs/ext4/super.c
fs/fs-writeback.c
fs/gfs2/log.c
fs/gfs2/quota.c
fs/nfs/nfs4proc.c
fs/xfs/xfs_buf.c
include/linux/sched.h
kernel/cpu.c
kernel/exit.c
kernel/fork.c
net/sunrpc/sched.c