git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1c3c3e 86c838b)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:27:32 +0000 (11:27 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:27:32 +0000 (11:27 -0800)
commitc5750ee69f469024d98019545e41c74abf1652bd
tree8c640b7e2d1e8cf013ac90b3569db54b0ec36e44tree | snapshot
parentb1c3c3ebf70548bb182d570b79a3f21045cd30e5commit | diff
parent86c838b03daf35e2af6555842d04fe09a89f8d93commit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  [PATCH] fs/ocfs2/aops.c: Correct use of ! and &
  [2.6 patch] ocfs2: make dlm_do_assert_master() static
  [2.6 patch] make ocfs2_downconvert_thread() static
  [2.6 patch] fs/ocfs2/: possible cleanups
  [PATCH] ocfs2: le*_add_cpu conversion
  ocfs2: Fix writeout in ocfs2_data_convert_worker()
  ocfs2: Enable localalloc for local mounts
Pandora Kernel Repository