diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/s390/kvm/diag.c | |
parent | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq() (diff) | |
parent | macb: allow GEM to have configurable receive buffer size (diff) | |
download | linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.xz linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.zip |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/s390/kvm/diag.c')
0 files changed, 0 insertions, 0 deletions