aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-21 15:25:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-21 15:25:39 -0400
commit57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (patch)
tree23fc946678d2d4bce1b74caab057333b433da150 /fs/cifs/file.c
parentad21b115772dfa146f19ec5d1db9de25973c483b (diff)
parenta536877e77f73ea22d12d94a019fedd9671b6acd (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Make Dell Latitude E6420 use reboot=pci x86: Make Dell Latitude E5420 use reboot=pci
Diffstat (limited to 'fs/cifs/file.c')
0 files changed, 0 insertions, 0 deletions