diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 23:42:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 23:42:24 +0100 |
| commit | f907ab06bb021bcb91d39c8d1b36536ebdb318fa (patch) | |
| tree | 6020618997a6ea1b5f5b59c89df35344023f7c82 /drivers/i2c/busses | |
| parent | Merge branch 'imx/defconfig' into next/drivers (diff) | |
| parent | Merge branch 'fixes' into next/fixes-non-critical (diff) | |
| download | linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.tar.xz linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.zip | |
Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/i2c/busses')
0 files changed, 0 insertions, 0 deletions