]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856
authorTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 22:12:35 +0000 (15:12 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 22:12:35 +0000 (15:12 -0700)
commita357644ac7eb3fd7177036a0dd9a3b2839184c00
tree3826afa3532e2f91bcac771aead63197b20e1e73
parent946deb792b95c6a263ceffddf61885c1dad2012b
Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856

Looks like automerge hosed it somehow.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/irq.c