]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - sitara-epos/sitara-epos-kernel.git/commitdiff
projects / sitara-epos / sitara-epos-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3daac7e 8af8b28)
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 18 Jun 2010 12:33:37 +0000 (14:33 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 18 Jun 2010 12:33:37 +0000 (14:33 +0200)
Conflicts:
Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
U-boot and Kernel for Sitara EPOS - Kernel Source repository for EPOS Specific features of AM43xx.