diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 12:04:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 12:04:49 -0700 |
| commit | 8c21f34126222239450717b78dda0c4962d9ebfa (patch) | |
| tree | 3ed64c828f8bf8896e684a6ae471ed56b926b0d8 /drivers/net/ppp_mppe.c | |
| parent | 3346857f6fab1d6d1237a3ec7cfa159ec9b52db5 (diff) | |
| parent | 4bca3286433585b5f1c3e7d8ac37a2f4b3def9ca (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Media rotation rate and form factor heuristics
libata: Report disk alignment and physical block size
sata_fsl: Fix the command description of FSL SATA controller
sata_fsl: Fix compile warnings
[libata] sata_sx4: fixup interrupt handling
[libata] sata_sx4: convert to new exception handling methods
Diffstat (limited to 'drivers/net/ppp_mppe.c')
0 files changed, 0 insertions, 0 deletions