diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 10:55:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 10:55:31 -0700 |
| commit | 690efa08e268a36df170bee79df93a9649c3f217 (patch) | |
| tree | 16fa1ccd5cefd3db92201908ca2a1051f86799db /drivers/firewire/net.c | |
| parent | 5698e9180cb70020bbf8b613174afe6308f902b0 (diff) | |
| parent | ae58d1e406986f31d1e88b32f5ac601506c196d8 (diff) | |
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
Pull embedded i2c update from Wolfram Sang:
"This only contains one new driver which had multiple dependencies
(pinctrl, i2c-mux-rework, new devm_* functions), so I decided to wait
for rc1. Plus, it had to wait a little for the ack of a devicetree
maintainer since the bindings were not trivial enough for me to pass
through.
So, given that, I hope there is still something like the "new driver
rule", so we could have the driver in 3.5 and people can start using
it. That would make merging support for some boards easier for 3.6
since the dependency on this driver is gone then."
* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
i2c: Add generic I2C multiplexer using pinctrl API
Diffstat (limited to 'drivers/firewire/net.c')
0 files changed, 0 insertions, 0 deletions