From: Jiri Kosina Date: Mon, 7 Dec 2009 17:30:49 +0000 (+0100) Subject: Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus X-Git-Tag: v2.6.33-rc1~343^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=447753d97764b0ae3969936ec495e794baa88052;p=users%2Fjedix%2Flinux-maple.git Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus --- 447753d97764b0ae3969936ec495e794baa88052