aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-16 14:32:38 -0500
committerTony Lindgren <tony@atomide.com>2011-02-16 14:32:38 -0500
commit9238b6d8e800f01f5cb42cc8e3e7b850ca49e83e (patch)
tree4e64edba76075fd3876daa777254e6c5e65c146b /drivers/w1
parent85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff)
parent37cd4fef6ebfa76acc6ef6de911123739098cff4 (diff)
parente811d3272dbed154b8c56a37392bb1d23c9bd71e (diff)
Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus