summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 21:12:30 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 21:12:30 +0200
commit5153f7e6dba37390902c8fd3edc9a8cc19358ece (patch)
tree1f47f0e30fd93a7d867382bc478d501436371e1a /include/asm-i386
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus (diff)
parentMerge with /home/shaggy/git/linus-clean/ (diff)
downloadlinux-5153f7e6dba37390902c8fd3edc9a8cc19358ece.tar.xz
linux-5153f7e6dba37390902c8fd3edc9a8cc19358ece.zip
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'include/asm-i386')
0 files changed, 0 insertions, 0 deletions