Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 1 Jun 2011 03:30:39 +0000 (20:30 -0700)]
1  2 
drivers/net/ks8842.c

Simple merge