tree 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5
parent dfef948ed2ba69cf041840b5e860d6b4e16fa0b1
parent 66b00a7c93ec782d118d2c03bd599cfd041e80a1
author David S. Miller <davem@davemloft.net> 1258611543 -0800
committer David S. Miller <davem@davemloft.net> 1258611543 -0800

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig