projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0143832 1c66b36)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Change some lock status member in ocfs2_lock_res to char.


Trivial merge