tree 1c05a37804a577a01011de8e4c781f2833b3ca9c
parent a19e2337790a7a0b8593c7d0b694dab83bfbd489
parent 343db4bda61feb3ac177d73f006e3527dcb431da
author Olof Johansson <olof@lixom.net> 1353521633 -0800
committer Olof Johansson <olof@lixom.net> 1353521633 -0800

Merge branch 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim:
This is for Samsung gpio stuff and got the ack from Linus Walleij.

* 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  gpio: samsung: use pr_* instead of printk
  gpio: samsung: Fix input mode setting function for GPIO int
  ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip