]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
projects / zynq / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 306416d b37b2e3)
Merge branch 'master' of /home/linnj/linux_mb/petalogix/linux-2.6-microblaze into...
authorXAQ IP Librarian <abq_iplib@xaqiptest40.(none)>
Wed, 9 Sep 2009 19:33:02 +0000 (13:33 -0600)
committerXAQ IP Librarian <abq_iplib@xaqiptest40.(none)>
Wed, 9 Sep 2009 19:33:02 +0000 (13:33 -0600)
1  2 
drivers/mtd/maps/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/maps/Kconfig
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
Linux kenrel for Xilinx Zynq