Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source

Conflicts:

	drivers/macintosh/adbhid.c

...

This commit is contained in:

Dmitry Torokhov 2007-10-12 21:27:47 -04:00

parent b11d2127c4 2b9e0aae1d

commit b981d8b3f5

8522 changed files with 721900 additions and 424181 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

include/linux/input.h

View file