original_kernel/drivers/telephony
Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus
Conflicts:

	kernel/irq/chip.c
2009-12-07 18:36:35 +01:00
..
Kconfig
Makefile
ixj-ver.h
ixj.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
ixj.h
ixj_pcmcia.c
phonedev.c