From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Sep 2012 02:48:44 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20120919~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d4f19c18e69f1971b2b105d2204bf154bc2b795;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	drivers/scsi/ipr.c
	drivers/video/backlight/88pm860x_bl.c
---

1d4f19c18e69f1971b2b105d2204bf154bc2b795