Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus ...

Conflicts:

	kernel/irq/chip.c

2009-12-07 18:36:35 +01:00

..

ixj_pcmcia.c

pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers)

2009-11-09 08:30:05 +01:00

ixj-ver.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ixj.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

ixj.h

[PATCH] drivers/telephony/ixj: Convert to generic boolean

2007-02-12 09:48:30 -08:00

Kconfig

kconfig: syntax cleanup - drop support for "depends/requires/def_boolean"

2007-10-12 21:20:32 +02:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

phonedev.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00