Merge commit 'upstream/master'
authorHaavard Skinnemoen <hskinnemoen@atmel.com>
Mon, 13 Aug 2007 14:34:33 +0000 (16:34 +0200)
committerHaavard Skinnemoen <hskinnemoen@atmel.com>
Mon, 13 Aug 2007 14:34:33 +0000 (16:34 +0200)
commit375c2c9e57ea5b8d678475379378f4774aa9cb88
treec8499eaec089c8fe7c9eda562131f45b4a7738c6
parentf0d1246ed7cb5a88522244c596d7ae7e6f161283
parent9986bc3e40e899bea372a99a2bca4071bdf2e24b
Merge commit 'upstream/master'
drivers/macb.c