From: Linus Torvalds Date: Mon, 22 Jun 2009 18:57:09 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 X-Git-Tag: v2.6.31-rc1~63 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/5165aece0efac6574fc3e32b6f1c2a964820d1c6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (43 commits) via-velocity: Fix velocity driver unmapping incorrect size. mlx4_en: Remove redundant refill code on RX mlx4_en: Removed redundant check on lso header size mlx4_en: Cancel port_up check in transmit function mlx4_en: using stop/start_all_queues mlx4_en: Removed redundant skb->len check mlx4_en: Counting all the dropped packets on the TX side usbnet cdc_subset: fix issues talking to PXA gadgets Net: qla3xxx, remove sleeping in atomic ipv4: fix NULL pointer + success return in route lookup path isdn: clean up documentation index cfg80211: validate station settings cfg80211: allow setting station parameters in mesh cfg80211: allow adding/deleting stations on mesh ath5k: fix beacon_int handling MAINTAINERS: Fix Atheros pattern paths ath9k: restore PS mode, before we put the chip into FULL SLEEP state. ath9k: wait for beacon frame along with CAB acer-wmi: fix rfkill conversion ath5k: avoid PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling ... --- 5165aece0efac6574fc3e32b6f1c2a964820d1c6 diff --cc MAINTAINERS index 1d4704300c1d,90a48e99e8b3..b114632050bf --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2853,10 -2863,10 +2853,10 @@@ P: Sergey Lapi M: slapin@ossfans.org L: linux-zigbee-devel@lists.sourceforge.net W: http://apps.sourceforge.net/trac/linux-zigbee - T: git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git S: Maintained F: net/ieee802154/ -F: drivers/ieee801254/ +F: drivers/ieee802154/ INTEGRITY MEASUREMENT ARCHITECTURE (IMA) P: Mimi Zohar