summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-23 20:43:15 +0100
committerTony Lindgren <tony@atomide.com>2011-02-23 20:43:15 +0100
commitc3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (patch)
tree1a52393126be95454c49f34be63f1fe3a6a9a15f
parentMerge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus (diff)
parentomap3: flash: use pr_err instead of printk (diff)
parentomap: Add chip id recognition for OMAP4 ES2.1 and ES2.2 (diff)
parentOMAP: hsmmc: Enable MMC4 and MMC5 on OMAP4 platforms (diff)
parentmtd: OneNAND: OMAP2: increase multiblock erase verify timeout (diff)
downloadlinux-c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5.tar.xz
linux-c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5.zip
Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into omap-for-linus