From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 22 May 2007 00:45:25 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: firefly_0821_release~28980
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71;p=firefly-linux-kernel-4.4.55.git

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)
---

d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71