From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2011 04:29:44 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20110905~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96a22812f1f49967dbb235df347368e1cc6a67a3;p=karo-tx-linux.git

Merge remote-tracking branch 'net/master'

Conflicts:
	MAINTAINERS
	arch/powerpc/configs/40x/hcu4_defconfig
---

96a22812f1f49967dbb235df347368e1cc6a67a3
diff --cc MAINTAINERS
index 1baea8d96ff3,579713ef7cfb..5231b8108dbd
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1573,9 -1574,10 +1573,9 @@@ F:	drivers/scsi/bfa
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
  M:	Rasesh Mody <rmody@brocade.com>
 -M:	Debashis Dutt <ddutt@brocade.com>
  L:	netdev@vger.kernel.org
  S:	Supported
- F:	drivers/net/bna/
+ F:	drivers/net/ethernet/brocade/bna/
  
  BSG (block layer generic sg v4 driver)
  M:	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>