]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:49:24 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:49:24 +0000 (12:49 +1000)
commitd29c677b354f2d524cc52f892233a32af6ad4e58
treea3cbf1ab42f1b5f19b5d269666d44267f8584996
parentede47c3acbbddeea0aedd51d4097ebf51bebd04a
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

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