diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:51:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:51:01 -0800 |
| commit | 9e203936eac786f9268d6a13e6442d2accef1829 (patch) | |
| tree | 1da906e1c099b3afacf3b358b8981931c4da45fd /net/nfc | |
| parent | 993ecff81aa6d50d694704de2647a5529ff2f166 (diff) | |
| parent | 724577ca355795b0a25c93ccbeee927871ca1a77 (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:
ore: Must support none-PAGE-aligned IO
ore: fix BUG_ON, too few sgs when reading
ore: Fix crash in case of an IO error.
ore: FIX breakage when MISC_FILESYSTEMS is not set
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions