From: David S. Miller <davem@davemloft.net>
Date: Sun, 15 Feb 2009 07:12:00 +0000 (-0800)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.30-rc1~662^2~737
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5e30589521518bff36fd2638b3c3d69679c50436;p=linux-2.6-block.git

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
---

5e30589521518bff36fd2638b3c3d69679c50436