projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da1ba89 9afadc4)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 May 2008 17:48:03 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 May 2008 17:48:03 +0000 (10:48 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: Fix memory corruption when fs mounted with noadinicb option
  udf: Make udf exportable
  udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline

1  2 
fs/udf/namei.c patch | diff1 | diff2 | blob | history
fs/udf/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/udf/namei.c
Simple merge
diff --cc fs/udf/super.c
Simple merge
John Crispins staging tree