]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a69eee4 ddf08f4)
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:57:41 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:57:41 +0000 (07:57 -0700)
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: confusion between kmap() and kmap_atomic() api
  exofs: Add default address_space_operations

1  2 
fs/exofs/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/exofs/inode.c
Simple merge
Linux kernel for KaRo TX COM modules