diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 12:02:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 12:02:22 -0700 |
| commit | 0d70397bc72f2122f9702093cce3039ec3ae7575 (patch) | |
| tree | 777ed3793d6fa999cbe700ae09181efec8d076a4 /drivers/net/niu.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | PCI: fix pci_resource_alignment prototype (diff) | |
| download | linux-dev-0d70397bc72f2122f9702093cce3039ec3ae7575.tar.xz linux-dev-0d70397bc72f2122f9702093cce3039ec3ae7575.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fix pci_resource_alignment prototype
Diffstat (limited to 'drivers/net/niu.c')
0 files changed, 0 insertions, 0 deletions