git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c3df3e 3c0eee3)
Merge commit 'v2.6.37' into for-2.6.38-incoming
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 11 Jan 2011 15:28:36 +0000 (10:28 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 11 Jan 2011 20:02:19 +0000 (15:02 -0500)
I made a slight mess of Documentation/filesystems/Locking; resolve
conflicts with upstream before fixing it up.


Trivial merge
Pandora Kernel Repository