projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 04fc5fd 2053ed0)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 May 2007 00:45:25 +0000 (17:45 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 May 2007 00:45:25 +0000 (17:45 -0700)
commitd6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71
tree009356baa16941facc8df7e057b78c0397093013tree | snapshot
parent04fc5fd39e09c460fd478ea84b34c445dd376759commit | diff
parent2053ed02a62f2c66d9cb9b51aea0836a7d8dbabfcommit | diff
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  Add constant for FCS/CRC length (frame check sequence)
  declance: Remove a dangling spin_unlock_irq() thingy
  e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1)
Unnamed repository; edit this file 'description' to name the repository.