diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 16:29:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 16:29:29 -0700 |
| commit | f1bb20a8365f6753e0f7b6e94981ca2b662bae13 (patch) | |
| tree | da5c2299763087c754d8a801f868ac9aaed82ab3 /kernel/tsacct.c | |
| parent | 90c69064c903f0993c7268c49670ad1f32030942 (diff) | |
| parent | 69f81e86540716e68e98e401bb91f339d6a0d31f (diff) | |
| download | blackbird-op-linux-f1bb20a8365f6753e0f7b6e94981ca2b662bae13.tar.gz blackbird-op-linux-f1bb20a8365f6753e0f7b6e94981ca2b662bae13.zip | |
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 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions
