summaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-28 15:32:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-28 15:32:29 -0700
commitf100353ff5bfd83be00ae55e98b4d611d2eb5681 (patch)
tree95c46d1793231b9046676d19cff8b03d13e01eb5 /arch/m32r
parent46d5c95b135f73051df7bc001e2d5c8e77e54cd6 (diff)
parentf4ec7f98714c2c0b7afa422c0cba6fb5c875c2c2 (diff)
downloadop-kernel-dev-f100353ff5bfd83be00ae55e98b4d611d2eb5681.zip
op-kernel-dev-f100353ff5bfd83be00ae55e98b4d611d2eb5681.tar.gz
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: e1000: Add device IDs of blade version of the 82571 quad port sky2: fix transmit state on resume sky2: FE+ vlan workaround sky2: sky2 FE+ receive status workaround
Diffstat (limited to 'arch/m32r')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud