diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:50:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:50:24 -0800 |
commit | 7b0cb1bdac9e941141e3790785955ed933d476f3 (patch) | |
tree | 8652bdbe540f5552696b3b8827189eda4b2e01e4 /drivers/net/ibmveth.h | |
parent | 275220f0fcff1adf28a717076e00f575edf05fda (diff) | |
parent | e6e1ee936d61d697735d17517678a626b7701ce4 (diff) |
Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block:
cciss: reinstate proper FIFO order of command queue list
floppy: replace NO_GEOM macro with a function
Diffstat (limited to 'drivers/net/ibmveth.h')
0 files changed, 0 insertions, 0 deletions