]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0db169f) | patch
[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 17 Nov 2005 15:47:30 +0000 (15:47 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Nov 2005 15:47:30 +0000 (15:47 +0000)
commit7d78c887a94067ba218dc71b89d0d7a09415197f
treeff87df902888694cada5173e91edeee6119a8d7etree | snapshot
parent0db169f9703115bab09eda5d89a8f6937a7bf98ecommit | diff
[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/i2c/busses/i2c-ixp2000.c diff | blob | history
drivers/i2c/busses/i2c-ixp4xx.c diff | blob | history
drivers/mtd/maps/ixp2000.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.