[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100723.140320.116366019.davem@davemloft.net>
Date: Fri, 23 Jul 2010 14:03:20 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: linville@...driver.com
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: pull request: wireless-next-2.6 2010-07-23
From: "John W. Linville" <linville@...driver.com>
Date: Fri, 23 Jul 2010 16:40:29 -0400
> Yet another batch intended for 2.6.36... Mostly the usual random lot
> of stuff, mostly driver updates. This batch also includes a flurry
> of Sparse-inspired patches from me -- it is hard to resist once the
> "bug" bites! As usual, all of these have been cooking in linux-next
> for at least several days.
>
> Please let me know if there are problems!
Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-commands.h
I don't even have to look at the file to know that it's
another one of those __packed things.
I'll fix it up again, but I know you can sense how tiring
this has become for me.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists