aboutsummaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-19 17:22:34 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-19 17:22:34 +0100
commit4a9226a3d192c38493106dcaf5f47f291ede9ed5 (patch)
treef5791e3147b713e02b69c528644a8a2d41b3ea7f /drivers/w1
parent7839c281edd9f4744be58ff0b29aabc64aabde31 (diff)
parente5f9dec8ff5ff3f6254412abed1f68d758f6616b (diff)
downloadlinux-4a9226a3d192c38493106dcaf5f47f291ede9ed5.tar.gz
Merge branch 'imx/cpuidle' into late/dt
This resolves one non-obvious merge conflict between the imx cpuidle patches and the imx DT changes for 3.9. Conflicts: arch/arm/mach-imx/mach-imx6q.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions