]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:20:03 +0000 (15:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:20:03 +0000 (15:20 +1100)
commitb99441c6618d7d3194910f12a8569890c6d4b046
tree38ef8dc76fd1266fc56ee86cd608aaa3b3a524c7
parent29dcb145593c18e94a094edbf4cc7fbba4d0ea4f
parent41dfa07cedcc469ccfe53b5d3ad4fc14d0d7a11f
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
kernel/cgroup_freezer.c
kernel/cgroup_freezer.c