diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 11:40:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 11:40:24 -0700 |
| commit | 3f4a12210774eb31c3435a5bc21d57aa20647aeb (patch) | |
| tree | 9a09e4717969f755c22071cc306ec253d2ecc0e3 /arch/arm/mach-omap1/board-voiceblue.c | |
| parent | 8ded371f81fba8b38a049f8c5f30ce6438fc7b75 (diff) | |
| parent | 488bf314bf219c66922305a1a320950efa86662f (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Allow i2c_add_numbered_adapter() to assign a bus id
i2c-ali1535: Fix style issues
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
0 files changed, 0 insertions, 0 deletions