diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:02:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:02:05 +0100 |
| commit | 03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch) | |
| tree | e2abb2baa5b71dcf1eb3786f339afbae5d27d7e4 /fs/ocfs2 | |
| parent | Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO (diff) | |
| download | linux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.xz linux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions