diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 17:41:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 17:41:20 -0400 |
commit | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (patch) | |
tree | 8b2142b2ed4a4951b4d7fc13739b6207730e6b04 /fs/cifs/cifsproto.h | |
parent | 57675e6e75c18f279b944dc2397cc9fd0053845e (diff) | |
parent | a4928cffe6435caf427ae673131a633c1329dbf3 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
"make namespacecheck" fixes
x86: fix compilation error in VisWS
x86: voyager fix
x86: Drop duplicate from setup.c
intel-iommu.c: dma ops fix
Diffstat (limited to 'fs/cifs/cifsproto.h')
0 files changed, 0 insertions, 0 deletions