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

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

2007-05-01 00:24:54 -04:00

..

buttons.c

Input: cobalt buttons - separate device and driver registration

2007-04-12 01:36:12 -04:00

console.c

[MIPS] Cobalt: clean up include files

2007-04-27 16:20:23 +01:00

irq.c

[MIPS] Cobalt: clean up include files

2007-04-27 16:20:23 +01:00

Makefile

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

2007-05-01 00:24:54 -04:00

mtd.c

[MIPS] Cobalt: Rename "Colo" MTD partition to "firmware".

2007-02-22 00:50:45 +00:00

pci.c

[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines

2007-04-27 16:20:23 +01:00

reset.c

[MIPS] Cobalt: clean up include files

2007-04-27 16:20:23 +01:00

setup.c

[MIPS] Cobalt: Split PCI codes from setup.c

2007-04-27 16:20:23 +01:00