From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Sep 2010 21:06:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.36-rc4~87
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=608307e6de2631e37f55f106a7cbbc560cb12751;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
  pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator
  ipvs: avoid oops for passive FTP
  Revert "sky2: don't do GRO on second port"
  gro: fix different skb headrooms
  bridge: Clear INET control block of SKBs passed into ip_fragment().
  3c59x: Remove incorrect locking; correct documented lock hierarchy
  sky2: don't do GRO on second port
  ipv4: minor fix about RPF in help of Kconfig
  xfrm_user: avoid a warning with some compiler
  net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()
  pxa168_eth: fix a mdiobus leak
  net sched: fix kernel leak in act_police
  vhost: stop worker only if created
  MAINTAINERS: Add ehea driver as Supported
  ath9k_hw: fix parsing of HT40 5 GHz CTLs
  ath9k_hw: Fix EEPROM uncompress block reading on AR9003
  wireless: register wiphy rfkill w/o holding cfg80211_mutex
  netlink: Make NETLINK_USERSOCK work again.
  irda: Correctly clean up self->ias_obj on irda_bind() failure.
  wireless extensions: fix kernel heap content leak
  ...
---

608307e6de2631e37f55f106a7cbbc560cb12751
diff --cc drivers/net/wireless/libertas/if_sdio.c
index ba854c70ab94,382f2371a1ab..87b634978b35
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@@ -125,10 -125,8 +125,10 @@@ struct if_sdio_card 
  
  	const char		*helper;
  	const char		*firmware;
 +	bool			helper_allocated;
 +	bool			firmware_allocated;
  
- 	u8			buffer[65536];
+ 	u8			buffer[65536] __attribute__((aligned(4)));
  
  	spinlock_t		lock;
  	struct if_sdio_packet	*packets;