]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ARM: OMAP: Temporary patch to avoid merge conflicts
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 14:01:01 +0000 (07:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 14:01:01 +0000 (07:01 -0700)
commitd1244aa95507c27ecd7660eaa62a535f2a1b24e2
tree7d5e870b47dfe3f9a010290dd441e6c504557b74
parenteeabf01fb98a51942363991c1827fe41adefba7d
ARM: OMAP: Temporary patch to avoid merge conflicts

Temporary patch to avoid merge conflicts
drivers/Kconfig
drivers/char/watchdog/Makefile
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/net/smc91x.h