diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:31:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:31:15 -0400 |
| commit | e7d688ec86c9c6aa94b58eeb266f833a76407018 (patch) | |
| tree | db7ce6fe6fc9b8c69287d2e8ee11f8724d171682 /include/linux/jffs2.h | |
| parent | d470c05bedc27dbd2df9d0bb6fd82336e4ff43db (diff) | |
| parent | ac522b638dcb549f9d33085c6fadea88a5f826ae (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] sclp_vt220 build fix
[S390] cio: change misleading console logic
[S390] call home support: fix proc handler
[S390] dasd: use idal for device characteristics
[S390] Add highgprs facility to /proc/cpuinfo
[S390] dasd: fix locking bug
[S390] tape390: Fix request queue handling in block driver
[S390] hypfs: Use subcode 6 if subcode 7 is not available
Diffstat (limited to 'include/linux/jffs2.h')
0 files changed, 0 insertions, 0 deletions