]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 00:49:05 +0000 (11:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 00:49:05 +0000 (11:49 +1100)
commitd1a1c34721410cbb092d7b7cabef3c0771d6152c
treee92613dbbf77d016b100a08871b3145c5392ee01
parent471e070a93127c4c54081293e5ca2a1e914af46d
parente00ed1970d51380cf555662768b83d4b15dccf69
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
MAINTAINERS
Documentation/kernel-parameters.txt
MAINTAINERS
kernel/sched.c