git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c300140 89b1f0a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 02:02:04 +0000 (13:02 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 02:02:04 +0000 (13:02 +1100)
commit	263ad69ee6ba798cef577e51349e8a85113cbbc8
tree	b0ada8809e0027e71c8db575f7a299885f84c2d7	tree \| snapshot
parent	c300140e0f05c37a1bb08f019ed3108c6d74eb83	commit \| diff
parent	89b1f0af2394edaa1675092a0d9f1cc30cba4d72	commit \| diff

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
kernel/cgroup_freezer.c

arch/m68k/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/log.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/quota.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup_freezer.c	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules