diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 11:24:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 11:24:20 -0700 |
| commit | ae000eec2c6aa785e1a85bea6e2f612fb826859a (patch) | |
| tree | 14ffaa202799aa1e2381a05f600c702a3c19f76b /net/lapb/lapb_timer.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [x86 setup] Correct the SMAP check for INT 0x15, AX=0xe820 (diff) | |
| download | linux-rng-ae000eec2c6aa785e1a85bea6e2f612fb826859a.tar.xz linux-rng-ae000eec2c6aa785e1a85bea6e2f612fb826859a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] Correct the SMAP check for INT 0x15, AX=0xe820
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions