summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/ioctl.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-12 20:33:51 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-12 20:33:51 +0000
commit8688a1a8637c6b833b9b70148809db4538352d2e (patch)
tree7b5d6c2d83c8bd1686811501c6287a650c40751b /arch/x86/include/asm/ioctl.h
parent3afdb0f3528991de0833224f2dba60dc061e01fa (diff)
parentf91f9cd505f92e4227ffda7e5799a33d4f34bf36 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
Diffstat (limited to 'arch/x86/include/asm/ioctl.h')
0 files changed, 0 insertions, 0 deletions