Merge remote-tracking branch 'origin/unstable' into rettichschnidi
authorReto Schneider <github@reto-schneider.ch>
Tue, 20 Mar 2012 18:55:27 +0000 (19:55 +0100)
committerReto Schneider <github@reto-schneider.ch>
Tue, 20 Mar 2012 18:55:27 +0000 (19:55 +0100)
1  2 
src/am7xxx.c

diff --cc src/am7xxx.c
Simple merge