]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5796e68 8bb65fc)
Merge commit '8bb65fc06c' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Jan 2018 21:11:47 +0000 (22:11 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Jan 2018 21:12:37 +0000 (22:12 +0100)
commit71ebb396b7b0bd2f45034786fd4eb496cb1fccdd
tree4c4d844c4d460051dfddd13764e624a7017aaa5dtree | snapshot
parent5796e682e6495923b0fea0cf1f2b095520bc29eccommit | diff
parent8bb65fc06c08f027980a917648e1cf6e4d51c5adcommit | diff
Merge commit '8bb65fc06c' into next/soc

This includes one fix from mainline to avoid introducing a build
regression after the pxa tree starts using gpio-reg:

drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?

* commit '8bb65fc06c':
  gpio: gpio-reg: fix build

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
local clone of linux.git