| commit | e80238be370678e3122bf4daf91ccb5391b09819 | |
| author | Martin 'povik' Poviser <martin.povik@gmail.com> | |
| Tue, 19 Jan 2010 23:17:41 +0000 (20 00:17 +0100) | ||
| committer | Martin 'povik' Poviser <martin.povik@gmail.com> | |
| Tue, 19 Jan 2010 23:17:41 +0000 (20 00:17 +0100) | ||
| tree | df6a995c0e528009acac26b079704c03189e6517 | treesnapshot (tar.gz zip) |
| parent | 732b9c89baa319efbbaa1dff82853985d1abf782 | commitdiff |
| parent | aed12ee4880c227f01a59422347743ff3765b66c | commitdiff |
Merge remote branch 'origin/master' into dhcp-client
Conflicts:
kernel/core/net/dhcp.c
Conflicts:
kernel/core/net/dhcp.c
| kernel/core/net/dhcp.c | diff1 | diff2 | blobhistory |