]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/beceem into work-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 9 Nov 2010 21:43:45 +0000 (13:43 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 9 Nov 2010 21:43:45 +0000 (13:43 -0800)

Trivial merge