]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63cd201 3042ac5)
Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:18:03 +0000 (23:18 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:18:03 +0000 (23:18 -0800)
From Simon Horman:
* 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: mackerel: Add FLCTL IRQ resource


Trivial merge