[commits] [git] linux integration tag, GregKH-20100808, created. v2.6.35-6238-gf8889e5

postmaster at open-mesh.net postmaster at open-mesh.net
Mon Aug 9 13:31:21 CEST 2010


The tag, GregKH-20100808 has been created
        at  f8889e5fe12a14d12733e52e8912e9ff56be69c3 (commit)

- Shortlog ------------------------------------------------------------
commit f8889e5fe12a14d12733e52e8912e9ff56be69c3
Merge: fd51e5b 45d7f32
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Aug 9 13:27:12 2010 +0200

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux
    
    Conflicts:
    	drivers/staging/batman-adv/bat_debugfs.c
    	drivers/staging/batman-adv/bat_sysfs.c
    	drivers/staging/batman-adv/hard-interface.c
    	drivers/staging/batman-adv/icmp_socket.c
    	drivers/staging/batman-adv/icmp_socket.h

-----------------------------------------------------------------------

-- 
linux integration


More information about the commits mailing list