summaryrefslogtreecommitdiffstats
path: root/include/linux/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-29 11:30:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-29 11:30:20 -0700
commitcab0d85c8dfcad4d799f9c294571440c6f1db091 (patch)
treeba7b348832673f6c7433b9d7481bfcd415f7a7b5 /include/linux/nfc
parent57ed609d4b64139b4d2cf5f3b4880a573a7905d2 (diff)
parent3c5cffb66d8ea94832650fcb55194715b0229088 (diff)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] mm: fix mmu_gather rework [S390] mm: fix storage key handling
Diffstat (limited to 'include/linux/nfc')
0 files changed, 0 insertions, 0 deletions