]> 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, 17 Aug 2011 02:49:11 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 02:49:11 +0000 (12:49 +1000)
commitfe69a8fae9de1f4845b43fbf66851435957e1e42
tree88f0afd7fe25c2ce3841290ea9523c389438f31f
parent7032952dfb7c6b3a1a24f36a5d1da5d47611464d
parent8e90efd32e55cd625e4b50471ea9b01c46afb210
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/mm/fault.c
Documentation/kernel-parameters.txt