From: Dave Airlie Date: Mon, 2 Aug 2010 00:05:18 +0000 (+1000) Subject: Merge tag 'v2.6.35-rc6' into drm-radeon-next X-Git-Tag: v2.6.36-rc1~71^2~49^2~10 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=d656ae53f64cb0f01dac8a02c4d31453d64ef97c Merge tag 'v2.6.35-rc6' into drm-radeon-next Need this to avoid conflicts with future radeon fixes --- d656ae53f64cb0f01dac8a02c4d31453d64ef97c