diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 11:56:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 11:56:10 -0400 |
| commit | 6c2445efb816a34dab7bb7357317e2d656f14cb1 (patch) | |
| tree | b4ce999c18a27fab4c41e802abc39944727bd0e7 /drivers/net/atlx/atl2.h | |
| parent | 929a8651f42544f2b94ec149dfb2901e0c0ee427 (diff) | |
| parent | d3375ea7213d09284ee3683d8bc075b9d3786a03 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cdrom: beyond ARRAY_SIZE of viocd_diskinfo
xen/blkfront: fix warning when deleting gendisk on unplug/shutdown
xen/blkfront: allow xenbus state transition to Closing->Closed when not Connected
Diffstat (limited to 'drivers/net/atlx/atl2.h')
0 files changed, 0 insertions, 0 deletions