| commit | 0163916f1db7f345963dad1af78b7628c759c6ee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 07:57:41 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 07:57:41 2010 -0700 |
| tree | c33e3551b7825e8700db65b8b27869f6f7d45c72 | |
| parent | a69eee4988752c7196677958b4ed8f4c2b28499a [diff] | |
| parent | ddf08f4b90a413892bbb9bb2e8a57aed991cd47d [diff] |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * '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