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)
1  2 
drivers/macb.c

diff --cc drivers/macb.c
Simple merge