summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-16 20:32:38 +0100
committerTony Lindgren <tony@atomide.com>2011-02-16 20:32:38 +0100
commit9238b6d8e800f01f5cb42cc8e3e7b850ca49e83e (patch)
tree4e64edba76075fd3876daa777254e6c5e65c146b /drivers/w1
parentLinux 2.6.38-rc5 (diff)
parentomap: McBSP: Remove unused audio macros in mcbsp.h (diff)
parentTI816X: Update to use init_early (diff)
downloadlinux-9238b6d8e800f01f5cb42cc8e3e7b850ca49e83e.tar.xz
linux-9238b6d8e800f01f5cb42cc8e3e7b850ca49e83e.zip
Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus