aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-04 08:36:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-04 08:36:56 -0700
commit246dd412d31e4f5de1d43aa6422a325b785f36e4 (patch)
tree404b0a126f523abd526daaf02846958a2647907c /security
parent2d9b57fbec9fde4deea3686f3927204efa218c7f (diff)
parenta57c1bade5a0ee5cd8b74502db9cbebb7f5780b2 (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl libata: kill unused constants sata_mv: PHY_MODE4 cleanups [libata] ata_piix: more acer short cable quirks [libata] ACPI: Properly handle bay devices in dock stations
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions