git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4515c30 573c24c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:33:59 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:33:59 +0000 (09:33 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: always use GFP_NOFS

1  2 
fs/dlm/plock.c patch | diff1 | diff2 | blob | history

diff --cc fs/dlm/plock.c
Simple merge
Pandora Kernel Repository