Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilm...
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:45:49 +0000 (14:45 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:45:49 +0000 (14:45 -0800)
commit55a4e78952286d498d89a399d845e7cfaa8ddd56
treef5d67bdaa07b36009476d2e1bdcde8b7dc0c6e3d
parent9c7bc451e41abf78b0fd856a9f916f7d39e26297
parent27b1fec2caa668c162cd1a862c69e087df277fae
Merge branch 'pm-hwmod-i2c' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus