diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 16:51:27 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 16:51:27 -0700 |
commit | 8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch) | |
tree | 88cd7852d59ebae54fcc2f57019ea13284042962 /MAINTAINERS | |
parent | 6f586e663e3b3674cadad0d5329424b006a0a289 (diff) | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
download | op-kernel-dev-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.zip op-kernel-dev-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.gz |
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 78a1ee4..3ad19ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3390,7 +3390,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> L: linux-i2c@vger.kernel.org W: http://i2c.wiki.kernel.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ -T: git git://git.fluff.org/bjdooks/linux.git +T: git git://git.pengutronix.de/git/wsa/linux.git S: Maintained F: Documentation/i2c/ F: drivers/i2c/ |