tree 6706abf3d8ab6353ef90962f39f854cdbe0b04a3
parent e3a36c415adcea823458ff0a1c77757d99b83cfa
parent 6560ee07dc946e94f7cc2cd8e3b5a5f5ee7340c1
author Olof Johansson <olof@lixom.net> 1323318987 -0800
committer Olof Johansson <olof@lixom.net> 1323318987 -0800

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes