summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2/Makefile.boot
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-07 16:29:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-07 16:29:29 -0700
commitf1bb20a8365f6753e0f7b6e94981ca2b662bae13 (patch)
treeda5c2299763087c754d8a801f868ac9aaed82ab3 /arch/arm/mach-prima2/Makefile.boot
parent90c69064c903f0993c7268c49670ad1f32030942 (diff)
parent69f81e86540716e68e98e401bb91f339d6a0d31f (diff)
Merge branch 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux
* 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux: i2c-bfin-twi: abort transfer is MEM bit is reset unexpectedly i2c-s3c2410: Remove useless break code i2c-s3c2410: Fix typo 'i2s' -> 'i2c' i2c: tegra: Assign unused slave address
Diffstat (limited to 'arch/arm/mach-prima2/Makefile.boot')
0 files changed, 0 insertions, 0 deletions