summaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 00:40:35 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 00:40:35 +0200
commit9262e9149f346a5443300f8c451b8e7631e81a42 (patch)
treef21b2d6f9270c7d0ff807f070e38d0f665582f21 /security/selinux
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[SPARC64]: Kill sun4v virtual device layer. (diff)
downloadlinux-9262e9149f346a5443300f8c451b8e7631e81a42.tar.xz
linux-9262e9149f346a5443300f8c451b8e7631e81a42.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill sun4v virtual device layer. [SERIAL] sunhv: Convert to of_driver layer. [SPARC64]: Mask out top 8-bits in physical address when building resources. [SERIAL] sunsu: Missing return statement in su_probe().
Diffstat (limited to 'security/selinux')
0 files changed, 0 insertions, 0 deletions