summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-01-1037-1074/+3914
|\
| * Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris2011-01-1011-931/+944
| |\
| | * SELinux: define permissions for DCB netlink messagesEric Paris2010-12-161-0/+2
| | * selinux: cache sidtab_context_to_sid resultsEric Paris2010-12-072-2/+39
| | * SELinux: do not compute transition labels on mountpoint labeled filesystemsEric Paris2010-12-021-1/+4
| | * SELinux: merge policydb_index_classes and policydb_index_othersEric Paris2010-11-301-59/+10
| | * selinux: convert part of the sym_val_to_name array to use flex_arrayEric Paris2010-11-305-68/+127
| | * selinux: convert type_val_to_struct to flex_arrayEric Paris2010-11-303-13/+34
| | * flex_array: fix flex_array_put_ptr macro to be valid CEric Paris2010-11-301-1/+1
| | * SELinux: do not set automatic i_ino in selinuxfsEric Paris2010-11-301-1/+0
| | * selinux: rework security_netlbl_secattr_to_sidEric Paris2010-11-301-21/+21
| | * SELinux: standardize return code handling in selinuxfs.cEric Paris2010-11-301-171/+157
| | * SELinux: standardize return code handling in selinuxfs.cEric Paris2010-11-301-337/+311
| | * SELinux: standardize return code handling in policydb.cEric Paris2010-11-301-287/+268
| * | Merge branch 'master' into nextJames Morris2011-01-094511-161161/+299399
| |\ \
| * | | MAINTAINERS: Add tomoyo-dev-en ML.Tetsuo Handa2010-12-191-1/+2
| * | | encrypted-keys: style and other cleanupMimi Zohar2010-12-152-37/+29
| * | | encrypted-keys: verify datablob size before converting to binaryMimi Zohar2010-12-151-14/+15
| * | | trusted-keys: kzalloc and other cleanupMimi Zohar2010-12-151-18/+16
| * | | trusted-keys: additional TSS return code and other error handlingMimi Zohar2010-12-151-62/+87
| * | | syslog: check cap_syslog when dmesg_restrictSerge E. Hallyn2010-12-082-11/+11
| * | | Smack: Transmute labels on specified directoriesJarkko Sakkinen2010-12-075-43/+141
| * | | Merge branch 'smack-next-master' into nextJames Morris2010-12-025-54/+178
| |\ \ \
| | * | | This patch adds a new security attribute to Smack calledCasey Schaufler2010-12-025-54/+178
| * | | | security: Fix comment of security_key_permissionTetsuo Handa2010-11-301-2/+1
| |/ / /
| * | | keys: add missing include file for trusted and encrypted keysMimi Zohar2010-11-292-0/+2
| * | | Smack: UDS revisionCasey Schaufler2010-11-281-43/+63
| * | | keys: add new key-type encryptedMimi Zohar2010-11-285-0/+1009
| * | | keys: add new trusted key-typeMimi Zohar2010-11-287-0/+1505
| * | | key: add tpm_send commandMimi Zohar2010-11-282-0/+20
| * | | tpm: add module_put wrapperMimi Zohar2010-11-282-2/+7
| * | | lib: hex2bin converts ascii hexadecimal string to binaryMimi Zohar2010-11-282-0/+17
| * | | security: Define CAP_SYSLOGSerge E. Hallyn2010-11-283-4/+13
| * | | Merge branch 'master' into nextJames Morris2010-11-281101-7507/+22015
| |\ \ \
| * | | | kernel: add roundup() code comment from akpmJames Morris2010-11-091-0/+2
* | | | | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-01-1036-1546/+1827
|\ \ \ \ \
| * | | | | hwmon: Support for Dallas Semiconductor DS620Roland Stigge2011-01-095-0/+403
| * | | | | hwmon: driver for Sensirion SHT21 humidity and temperature sensorUrs Fleisch2011-01-084-0/+367
| * | | | | hwmon: Add humidity attribute to sysfs ABIGuenter Roeck2011-01-081-0/+9
| * | | | | hwmon: sysfs ABI updatesGuenter Roeck2011-01-081-7/+33
| * | | | | hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtempJan Beulich2011-01-081-14/+11
| * | | | | hwmon: (lm95241) Rewrite to avoid using macrosDavide Rizzo2011-01-081-262/+233
| * | | | | hwmon: (applesmc) Fix checkpatch errors and fix value range checksGuenter Roeck2011-01-081-18/+16
| * | | | | hwmon: (applesmc) Update copyright informationHenrik Rydberg2011-01-081-0/+1
| * | | | | hwmon: (applesmc) Silence driverHenrik Rydberg2011-01-081-4/+0
| * | | | | hwmon: (applesmc) Simplify feature sysfs handlingHenrik Rydberg2011-01-081-93/+76
| * | | | | hwmon: (applesmc) Dynamic creation of fan filesHenrik Rydberg2011-01-081-145/+43
| * | | | | hwmon: (applesmc) Extract all features genericallyHenrik Rydberg2011-01-081-182/+59
| * | | | | hwmon: (applesmc) Handle new temperature formatHenrik Rydberg2011-01-081-3/+9
| * | | | | hwmon: (applesmc) Dynamic creation of temperature filesHenrik Rydberg2011-01-081-389/+111