Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts: include/net/tcp.h

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/net/tcp.h
50170656 · David S. Miller · e93737b0 · 2fe77b81 · 50170656 · 50170656
Commit 50170656 authored 15 years ago by David S. Miller
20 changed files
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c