Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Last revision Both sides next revision
soc:2009:oremanj:journal:week4 [2009/06/20 18:29]
rwcr
soc:2009:oremanj:journal:week4 [2009/06/20 18:42]
rwcr
Line 187: Line 187:
  
 ==== Saturday, 20 June ==== ==== Saturday, 20 June ====
-Everything ​has been pushed to mainline-review. :-) +Did a bunch of cleanup with no feature changes, and everything ​has been pushed to mainline-review. :-) 
-  * Branch ​**wireless**: deleted!+  * On branch ​**wireless**, merged in mainline-review such that wireless and mainline-review now represent the same tree.
   * On branch **mainline-review**:​   * On branch **mainline-review**:​
     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=4edf4718760dfb35c6a0c811fc2e019fb176e9fc|     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=4edf4718760dfb35c6a0c811fc2e019fb176e9fc|
-[802.11] Add support for 802.11 devices with software MAC layer]]+[802.11] Add support for 802.11 devices with software MAC layer]] [+8,006 bytes]
     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=b23fba30c9847b8fabf651d50cf6e4e323753548|     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=b23fba30c9847b8fabf651d50cf6e4e323753548|
-[rtl818x] Add driver for Realtek 8180/8185 wireless cards]]+[rtl818x] Add driver for Realtek 8180/8185 wireless cards]] [+3,298 + (2,930 for rtl8180; 8,198 for rtl8185) bytes]
     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b|     * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b|
-[iwmgmt] Add user-level 802.11 management commands and common error tables]] +[iwmgmt] Add user-level 802.11 management commands and common error tables]] [+1,779 bytes]
-    * [[http://​git.etherboot.org/?​p=people/​oremanj/​gpxe.git;​a=commit;​h=c35f15c32c3891711f0b0a99b8439aefd025b5ce| +
-Merge branch '​wireless'​ into mainline-review]] (merge style "​ours",​ no modifications introduced)+
  
 Commits ready for mainline review, in reverse order: Commits ready for mainline review, in reverse order:
-  oremanj@xenon /​home/​oremanj/​dev/​gpxe/​src % git log --pretty=oneline ​--first-parent ​mainline-review | head -n 13+  oremanj@xenon /​home/​oremanj/​dev/​gpxe/​src % git log --pretty=oneline mainline-review | head -n 12
   dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b [iwmgmt] Add user-level 802.11 management commands and common error tables   dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b [iwmgmt] Add user-level 802.11 management commands and common error tables
   b23fba30c9847b8fabf651d50cf6e4e323753548 [rtl818x] Add driver for Realtek 8180/8185 wireless cards   b23fba30c9847b8fabf651d50cf6e4e323753548 [rtl818x] Add driver for Realtek 8180/8185 wireless cards
Line 214: Line 212:
   18e6470d06d8846d531d97d881be6f1278bd2f15 [nvs] Add init function for Atmel 93C66 EEPROM   18e6470d06d8846d531d97d881be6f1278bd2f15 [nvs] Add init function for Atmel 93C66 EEPROM
  
-Next up: encryption!+Next up: encryption...

QR Code
QR Code soc:2009:oremanj:journal:week4 (generated for current page)