]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/hwmon/ad7414.c
Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
authorMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 09:56:52 +0000 (11:56 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 09:56:52 +0000 (11:56 +0200)
commit62052be3a797f26f6f0fe30fc8d7f40ab54e08fd
treebfdd68b770778dfaade57a51c0e8f6938f14c6f6
parentd5eda75f3a6a08f5a3644764a88d288e62e7823d
parent0a564b2645c8766a669c55bde1f1ef5b0518caec
Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes

Conflicts:
Makefile
Makefile