diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 15:25:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 15:25:39 -0400 |
| commit | 57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (patch) | |
| tree | 23fc946678d2d4bce1b74caab057333b433da150 /fs/lockd/clntxdr.c | |
| parent | ad21b115772dfa146f19ec5d1db9de25973c483b (diff) | |
| parent | a536877e77f73ea22d12d94a019fedd9671b6acd (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/lockd/clntxdr.c')
0 files changed, 0 insertions, 0 deletions