From: David S. Miller 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: https://git.stricted.de/?a=commitdiff_plain;h=08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: drivers/net/wimax/i2400m/usb-notif.c --- 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6