]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
i2c-omap: Fix mismerge
authorTony Lindgren <tony@atomide.com>
Fri, 20 Feb 2009 18:48:01 +0000 (10:48 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Feb 2009 18:48:01 +0000 (10:48 -0800)
commitbeb45c5ac8111b6307bf89717315db6ef21f5689
tree4e558642843de7584534fe5aeb0cb88a44a3ea3a
parent107d994ba4807eddb67463613931d0a64a1c0fc4
i2c-omap: Fix mismerge

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/i2c/busses/i2c-omap.c