summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* integrity: special fs magicMimi Zohar2008-10-134-7/+7
* Merge branch 'next' into for-linusJames Morris2008-10-1325-1024/+2793
|\
| * Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_nex...James Morris2008-10-1122-972/+2732
| |\
| | * netlabel: Add configuration support for local labelingPaul Moore2008-10-104-3/+50
| | * cipso: Add support for native local labeling and fixup mapping namesPaul Moore2008-10-106-36/+128
| | * netlabel: Changes to the NetLabel security attributes to allow LSMs to pass f...Paul Moore2008-10-102-2/+3
| | * selinux: Cache NetLabel secattrs in the socket's security structPaul Moore2008-10-104-39/+91
| | * selinux: Set socket NetLabel based on connection endpointPaul Moore2008-10-108-37/+311
| | * netlabel: Add functionality to set the security attributes of a packetPaul Moore2008-10-108-42/+393
| | * netlabel: Add network address selectors to the NetLabel/LSM domain mappingPaul Moore2008-10-109-224/+816
| | * netlabel: Add a generic way to create ordered linked lists of network addrsPaul Moore2008-10-104-216/+569
| | * netlabel: Replace protocol/NetLabel linking with refrerence countsPaul Moore2008-10-108-266/+235
| | * smack: Fix missing calls to netlbl_skbuff_err()Paul Moore2008-10-101-1/+4
| | * selinux: Fix missing calls to netlbl_skbuff_err()Paul Moore2008-10-105-9/+50
| | * selinux: Fix a problem in security_netlbl_sid_to_secattr()Paul Moore2008-10-101-2/+8
| | * selinux: Better local/forward check in selinux_ip_postroute()Paul Moore2008-10-101-45/+81
| | * netlabel: Remove unneeded in-kernel API functionsPaul Moore2008-10-102-74/+23
| | * selinux: Correctly handle IPv4 packets on IPv6 sockets in all casesPaul Moore2008-10-101-5/+17
| | * selinux: Cleanup the NetLabel glue codePaul Moore2008-10-101-28/+10
| | * netlabel: Fix some sparse warningsPaul Moore2008-10-103-14/+14
| * | As pointed out by Jonathan Corbet, the timer must be deleted beforeRajiv Andrade2008-10-111-1/+1
| * | ERROR: code indent should use tabs where possibleAndrew Morton2008-10-110-0/+0
| * | The tpm_dev_release function is only called for platform devices, not pnpRajiv Andrade2008-10-113-7/+30
| * | Protect tpm_chip_list when transversing it.Rajiv Andrade2008-10-111-37/+24
| * | Renames num_open to is_open, as only one process can open the file at a time.Rajiv Andrade2008-10-112-5/+4
| * | Remove the BKL calls from the TPM driver, which were added in the overallRajiv Andrade2008-10-111-4/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2008-10-121-2/+0
|\ \ \
| * | | [CIFS] cifs: remove pointless lock and unlock of GlobalMid_Lock in header_ass...Jeff Layton2008-10-121-2/+0
* | | | Fix Kconfig dependency for WM97xx battery driverLinus Torvalds2008-10-121-1/+1
* | | | Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-12105-2190/+5014
|\ \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----------------. \ \ \ Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x...Ingo Molnar2008-10-12102-2177/+4955
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | x86: replace a magic number with a named constant in the VESA boot codeMichal Januszewski2008-10-051-1/+1
| | | | | | | | | | | * | | | x86 setup: remove IMAGE_OFFSETPaul Bolle2008-10-041-3/+1
| | | | | | | | | | | * | | | x86 setup: remove DEF_INITSEG and DEF_SETUPSEGPaul Bolle2008-10-041-2/+0
| | | | | | | | | | | * | | | Merge commit 'v2.6.27-rc8' into x86/setupIngo Molnar2008-10-0310999-398622/+640197
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | | Revert "x86: fix ghost EDD devices in /sys again"H. Peter Anvin2008-10-031-3/+1
| | | | | | | | | | | * | | | | x86 setup: fix ghost entries under /sys/firmware/edd take 3Andrey Borzenkov2008-10-031-1/+6
| | | | | | | | | | | * | | | | x86: fix ghost EDD devices in /sys againAndrey Borzenkov2008-09-061-1/+3
| | | | | | | | | | | * | | | | x86: when building image.iso, use isohybrid if it existsH. Peter Anvin2008-09-051-0/+1
| | | | | | | | | | | * | | | | x86: boot/compressed/Makefile: fix "make clean"H. Peter Anvin2008-09-041-4/+4
| | | | | | | | | | | * | | | | x86 setup: remove remnants of CONFIG_VIDEO_SELECT (read: vga=)Alexey Dobriyan2008-09-034-20/+0
| | | | | | | | | | * | | | | | Merge branch 'linus' into x86/quirksIngo Molnar2008-10-123668-114326/+215359
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |_|/ / / | | | | | | | | | | | |/| | | |
| | | | | | | | | | * | | | | | x86: SB450: deprioritize DMI quirksIngo Molnar2008-10-071-2/+10
| | | | | | | | | | * | | | | | x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPICAndreas Herrmann2008-10-071-0/+48
| | | | | | | | | * | | | | | | x86: ioperm user_regsetRoland McGrath2008-10-122-0/+38
| | | | | | | | | | |/ / / / / | | | | | | | | | |/| | | | |
| | | | | | | | * | | | | | | x86, fpu: check __clear_user() return valueIngo Molnar2008-10-121-1/+3
| | | | | | | | * | | | | | | Merge branch 'linus' into x86/xsaveIngo Molnar2008-10-124414-163400/+286164
| | | | | | | | |\| | | | | |
| | | | | | | | * | | | | | | x86: xsave: set FP, SSE bits in the xsave header in the user sigcontextSuresh Siddha2008-10-072-0/+39
| | | | | | | | * | | | | | | x86: xsave: fix error condition in save_i387_xstate()Suresh Siddha2008-10-071-0/+2
| | | | | | | | * | | | | | | x86: make setup_xstate_init() __initAlexey Dobriyan2008-09-061-1/+1