summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:05 -0800
commit03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch)
treee2abb2baa5b71dcf1eb3786f339afbae5d27d7e4 /security
parent7b0cb1bdac9e941141e3790785955ed933d476f3 (diff)
parent1427130425c1239d977e8891c3a8923f53a6e352 (diff)
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 'security')
0 files changed, 0 insertions, 0 deletions