-
- Downloads
Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: 
James Morris <jmorris@namei.org>
Showing
- Documentation/DocBook/libata.tmpl 16 additions, 33 deletionsDocumentation/DocBook/libata.tmpl
- Documentation/input/elantech.txt 4 additions, 4 deletionsDocumentation/input/elantech.txt
- crypto/async_tx/async_raid6_recov.c 13 additions, 8 deletionscrypto/async_tx/async_raid6_recov.c
- drivers/ata/pata_pcmcia.c 2 additions, 2 deletionsdrivers/ata/pata_pcmcia.c
- drivers/ide/ide-cs.c 2 additions, 2 deletionsdrivers/ide/ide-cs.c
- drivers/input/joydev.c 18 additions, 0 deletionsdrivers/input/joydev.c
- drivers/input/misc/ati_remote.c 9 additions, 5 deletionsdrivers/input/misc/ati_remote.c
- drivers/input/mouse/alps.c 0 additions, 1 deletiondrivers/input/mouse/alps.c
- drivers/input/mouse/elantech.c 56 additions, 28 deletionsdrivers/input/mouse/elantech.c
- drivers/input/mouse/psmouse-base.c 15 additions, 3 deletionsdrivers/input/mouse/psmouse-base.c
- drivers/input/mouse/psmouse.h 1 addition, 0 deletionsdrivers/input/mouse/psmouse.h
- drivers/input/mouse/synaptics.c 30 additions, 5 deletionsdrivers/input/mouse/synaptics.c
- drivers/input/mouse/synaptics.h 4 additions, 0 deletionsdrivers/input/mouse/synaptics.h
- drivers/input/touchscreen/eeti_ts.c 46 additions, 10 deletionsdrivers/input/touchscreen/eeti_ts.c
- drivers/mtd/internal.h 0 additions, 0 deletionsdrivers/mtd/internal.h
- drivers/mtd/mtdbdi.c 0 additions, 0 deletionsdrivers/mtd/mtdbdi.c
- drivers/net/arm/ep93xx_eth.c 5 additions, 5 deletionsdrivers/net/arm/ep93xx_eth.c
- drivers/net/e1000e/netdev.c 3 additions, 0 deletionsdrivers/net/e1000e/netdev.c
- drivers/net/fec.c 1 addition, 1 deletiondrivers/net/fec.c
- drivers/net/phy/Kconfig 5 additions, 0 deletionsdrivers/net/phy/Kconfig
Loading
Please register or sign in to comment