summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/io-unit.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-08-05 23:26:19 +0200
committerLinus Torvalds2010-08-05 23:26:19 +0200
commitc60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 (patch)
treea52f8e38956ddaa64a5371993d509875fbe5d726 /arch/sparc/mm/io-unit.c
parentMerge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k... (diff)
parentapparmor: depends on NET (diff)
downloadkernel-qcow2-linux-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.gz
kernel-qcow2-linux-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.tar.xz
kernel-qcow2-linux-c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: apparmor: depends on NET
Diffstat (limited to 'arch/sparc/mm/io-unit.c')
0 files changed, 0 insertions, 0 deletions