Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-08-07 06:38:41 -04:00
commit 242898be7a
94 changed files with 1133 additions and 723 deletions

View file

@ -256,7 +256,6 @@ typedef struct
#define NO_ORDER_CHECK_MASK 0x00000010
#define LOW_CHANNEL_MASK 0x00000020
#define NO_HSCX30_MASK 0x00000040
#define MODE_MASK 0x00000080
#define SET_BOARD 0x00001000
#define SET_CRC4 0x00030000
#define SET_L1_TRISTATE 0x00040000