drivers/net/irda/pxaficp_ir.c · c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea · Kirill Smelkov / linux

Russell King authored Dec 02, 2008

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/mach-pxa/pxa25x.c

c5b84b3b