kernel-ark/drivers/gpio
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
gpio-74x164.c gpio/74x164: fix clash with gpiolib namespace 2011-06-13 09:03:48 -06:00
gpio-ab8500.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
gpio-adp5520.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-adp5588.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-bt8xx.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
gpio-cs5535.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-da9052.c gpio/da9052: remove a redundant assignment for gpio->da9052 2011-07-14 12:41:53 +09:00
gpio-ep93xx.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
gpio-exynos4.c Merge branch 'gpio/next-tegra' into gpio/next 2011-06-15 14:57:39 -06:00
gpio-generic.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-it8761e.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-janz-ttl.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-langwell.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-max730x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max732x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max7300.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max7301.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-mc33880.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-mcp23s08.c mcp23s08: add i2c support 2011-07-15 13:54:18 -06:00
gpio-ml-ioh.c gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err 2011-06-16 13:44:29 -06:00
gpio-mpc5200.c gpio: Move mpc5200 gpio driver to drivers/gpio 2011-07-06 11:57:15 -06:00
gpio-mxc.c gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming 2011-07-19 13:10:02 -06:00
gpio-mxs.c gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming 2011-07-19 13:10:02 -06:00
gpio-nomadik.c gpio/nomadik: fix sleepmode for elder Nomadik 2011-06-09 15:03:38 -06:00
gpio-omap.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-pca953x.c gpio/pca953x: Deprecate meaningless device-tree bindings 2011-06-16 13:41:50 -06:00
gpio-pcf857x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-pch.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-pl061.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-plat-samsung.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-rdc321x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-s5pc100.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-s5pv210.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-sch.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-stmpe.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-sx150x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tc3589x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tegra.c gpio/tegra: Use engineering names in DT compatible property 2011-07-05 23:36:32 -06:00
gpio-timberdale.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tps65910.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-twl4030.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-u300.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
gpio-ucb1400.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-vr41xx.c gpio/vr41xx: Convert use of struct resource to resource_size(ptr) 2011-06-10 23:37:10 -06:00
gpio-vx855.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-wm831x.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-wm8350.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-wm8994.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-xilinx.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpiolib.c gpio: make gpio_{request,free}_array gpio array parameter const 2011-05-27 17:56:45 -06:00
Kconfig mcp23s08: add i2c support 2011-07-15 13:54:18 -06:00
Makefile gpio: Move mpc5200 gpio driver to drivers/gpio 2011-07-06 11:57:15 -06:00