| commit | 650cf77d750153a5c1f51ae78a93f399151032d1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 24 15:54:30 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 24 15:54:30 2011 -0700 |
| tree | 34c3cea34650f669fd5acaed34de6d5ac67c415f | |
| parent | a53e77fa57145cef6e2a63925db3d426128b2335 [diff] | |
| parent | c8d47631a48f254d062db8084776d1fb24785e7b [diff] |
Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux * 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux: i2c-nomadik: fix kerneldoc warning Revert "i2c-omap: fix static suspend vs. runtime suspend" i2c-nomadik: Do not use _interruptible_ variant call