summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2008-10-1329-1031/+2800
|\
| * 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.infradead.org/users/dwmw2/random-2.6Linus Torvalds2008-10-1357-683/+204
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2008-10-134543-143298/+246600
| |\ \ \ \
| * | | | | Fix autoloading of MacBook Pro backlight driver.David Woodhouse2008-10-131-3/+1
| * | | | | Automatic MODULE_ALIAS() for DMI match tables.David Woodhouse2008-10-133-39/+106
| * | | | | Remove asm/a.out.h files for all architectures without a.out support.Adrian Bunk2008-09-0624-255/+0
| * | | | | Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUTDavid Woodhouse2008-09-066-3/+11
| * | | | | Remove redundant CONFIG_ARCH_SUPPORTS_AOUTDavid Woodhouse2008-09-0612-36/+2
| * | | | | S390: Update comments about why we don't use <asm-generic/statfs.h>David Woodhouse2008-09-061-7/+4
| * | | | | SPARC: Use <asm-generic/statfs.h>David Woodhouse2008-09-064-67/+3
| * | | | | PowerPC: Use <asm-generic/statfs.h>David Woodhouse2008-09-061-54/+0
| * | | | | PARISC: Use <asm-generic/statfs.h>David Woodhouse2008-09-061-53/+2
| * | | | | x86_64: Use <asm-generic/statfs.h>David Woodhouse2008-09-061-56/+5
| * | | | | IA64: Use <asm-generic/statfs.h>David Woodhouse2008-09-041-47/+5
| * | | | | ARM: Use <asm-generic/statfs.h>David Woodhouse2008-09-041-32/+2
| * | | | | Make <asm-generic/statfs.h> suitable for 64-bit platforms.David Woodhouse2008-09-042-17/+52
| * | | | | Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driverDavid Woodhouse2008-09-042-10/+4
| * | | | | [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉDavid Woodhouse2008-09-042-1/+6
| * | | | | Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.David Woodhouse2008-09-042-2/+2
| * | | | | EFS: Don't set f_fsid in statfs().David Woodhouse2008-09-021-2/+0
* | | | | | Merge phase #5 (misc) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/li...Linus Torvalds2008-10-1374-2512/+2793
|\ \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4Ingo Molnar2008-10-1320-374/+1004
| |\ \ \ \ \ \ \
| | | * | | | | | HPET: Remove spurious HPET busy warning message.David John2008-10-101-4/+0
| | | * | | | | | Merge commit 'v2.6.27' into timers/hpetIngo Molnar2008-10-10436-3040/+4706
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
OpenPOWER on IntegriCloud