projects / kernel / kernel-generic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c2a2ae 7e125f7)
Merge remote branch 'origin' into secretlab/next-spi
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 25 May 2010 06:38:26 +0000 (00:38 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 25 May 2010 06:38:26 +0000 (00:38 -0600)
1  2 
drivers/serial/mpc52xx_uart.c patch | diff1 | diff2 | blob | history
drivers/spi/Kconfig patch | diff1 | diff2 | blob | history
drivers/spi/spi_mpc8xxx.c patch | diff1 | diff2 | blob | history

diff --cc drivers/serial/mpc52xx_uart.c
Simple merge
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/spi_mpc8xxx.c
Simple merge
Domain: System / Uncategorized;