diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 02:51:32 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 02:51:32 -0400 |
| commit | bf98a6eaa9964fef49f186834713bfc57d16ede1 (patch) | |
| tree | 46dc9e802c90fa7d6854f19f829945ea9bfb1bc8 /lib/hexdump.c | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 22bfe102c0c39f0bac24950b875e7bfdeb329dd9 (diff) | |
Merge branch 'for-3.5/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt2
By Stephen Warren (29) and others
via Stephen Warren
* 'for-3.5/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (43 commits)
ARM: dt: tegra trimslice: add support for audio
ARM: dt: tegra trimslice: enable SDHCI1 controller
ARM: dt: tegra trimslice: add RTC I2C device
ARM: dt: tegra seaboard: add i2c devices
ARM: dt: tegra seaboard: configure I2C2 pinmux
ARM: dt: tegra seaboard: fix I2C2 SCL rate
ARM: dt: tegra: enable als and proximity sensor
+ pinctrl mergebase branch
The pinctrl mergebase branch merge conflicts in drivers/pinctrl/core.c
that were resolved.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'lib/hexdump.c')
0 files changed, 0 insertions, 0 deletions