Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Jan 2013 19:31:56 +0000 (14:31 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jan 2013 19:31:56 +0000 (14:31 -0500)
Jeff Kirsher says:

====================
This series contains updates to e1000e only.

v2- updates patch 09/15 "e1000e: resolve checkpatch PREFER_PR_LEVEL warning"
    based on feedback from Joe Perches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge