]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ARM: OMAP: Manual merge of conflicts
authorTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:21:36 +0000 (13:21 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:21:36 +0000 (13:21 +0300)
commit9e4f6337780c31a28f394097feadf1ca3dddc105
tree67b20bf869b24569f98d504c03671a1db20282dd
parent51764ca2d595d62f8bd3ef896a03cb229d30baf3
ARM: OMAP: Manual merge of conflicts

Manual merge of conflicts
arch/arm/plat-omap/gpio.c
drivers/Makefile
drivers/char/watchdog/Makefile