From: David S. Miller <davem@davemloft.net>
Date: Thu, 26 Mar 2009 22:23:24 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c
---

08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6