summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "task_struct: make journal_info conditional"Linus Torvalds2009-12-1710-20/+1
* Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"Linus Torvalds2009-12-173-1/+11
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/v...Linus Torvalds2009-12-1724-163/+136
|\
| * kill I_LOCKChristoph Hellwig2009-12-179-44/+39
| * fold do_sync_file_range into sys_sync_file_rangeChristoph Hellwig2009-12-172-40/+23
| * fix up O_SYNC commentsChristoph Hellwig2009-12-174-4/+4
| * VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_...Erez Zadok2009-12-172-4/+52
| * fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr_allErez Zadok2009-12-175-22/+9
| * vfs: remove extraneous NULL d_inode check from do_filp_openJeff Layton2009-12-171-1/+1
| * fs: no games with DCACHE_UNHASHEDNick Piggin2009-12-173-50/+0
| * fs: anon_inodes implement dnameNick Piggin2009-12-171-0/+10
| * dio: fix use-after-freeAl Viro2009-12-171-1/+1
* | Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-scoreLinus Torvalds2009-12-176-9/+31
|\ \
| * | score: include asm-generic/param.h in asm/delay.h.Chen Liqin2009-12-171-0/+2
| * | score: fixed pfn_valid define.Chen Liqin2009-12-173-6/+2
| * | score: add flush_dcahce_page and PG_dcache_dirty defineChen Liqin2009-12-172-3/+27
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg...Linus Torvalds2009-12-1717-611/+1981
|\ \
| * | regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()Roel Kluin2009-12-171-1/+1
| * | twl-regulator: Fix reg_disable functionality for 4030 and 6030Juha Keski-Saari2009-12-171-2/+2
| * | twl-regulator: Add turnon delay to reg_enableJuha Keski-Saari2009-12-171-1/+7
| * | twl-regulator: Restore REMAP configuration in regulator probeJuha Keski-Saari2009-12-171-0/+3
| * | twl-regulator: Add turnon-delay and REMAP config to twlreg_info structJuha Keski-Saari2009-12-171-41/+62
| * | twl-regulator: Define critical regulators as always_onJuha Keski-Saari2009-12-171-0/+13
| * | twl-regulator: Add all twl4030 regulators to twlreg_infoJuha Keski-Saari2009-12-171-9/+17
| * | regulator: mc13783-regulator: correct the probing time.Alberto Panizzo2009-12-171-2/+2
| * | regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable}...Lars-Peter Clausen2009-12-171-2/+2
| * | regulator: core.c: Small coding style cleanup (indentation fixup)Stefan Roese2009-12-171-6/+6
| * | drivers/regulator: use PTR_ERR to get error codeJulia Lawall2009-12-171-2/+2
| * | regulator: consumer.h - fix build when consumer.h is #included first.Liam Girdwood2009-12-171-0/+2
| * | regulator/mc13783: various cleanupsUwe Kleine-König2009-12-171-277/+112
| * | regulator/mc13783: rename source file to match other driversUwe Kleine-König2009-12-172-1/+1
| * | Fix some AB3100 regulator issuesLinus Walleij2009-12-171-21/+2
| * | regulator: keep index within bounds in da9034_get_ldo12_voltage()Roel Kluin2009-12-171-1/+1
| * | regulator: Ensure val is initialised in 88pm8607 choose_voltage()Mark Brown2009-12-171-1/+2
| * | regulator: Remove duplicate consts from ab3100Mark Brown2009-12-171-5/+5
| * | regulator: Handle regulators without suspend mode configurationMark Brown2009-12-172-4/+27
| * | regulator: Factor out regulator name pretty printingMark Brown2009-12-171-45/+38
| * | regulator: Display actual settings with constraintsMark Brown2009-12-171-13/+31
| * | regulator: Also lift apply_uV into machine_constraints_voltage()Mark Brown2009-12-171-17/+18
| * | regulator: Factor out voltage constraint setupMark Brown2009-12-171-27/+37
| * | regulator: Report error codes for bulk operationsMark Brown2009-12-171-4/+5
| * | regulator: add 88PM8607 PMIC driverHaojian Zhuang2009-12-173-0/+691
| * | regulator: Implement WM831x BuckWise DC-DC convertor DVS supportMark Brown2009-12-172-18/+206
| * | regulator: add driver for MAX8660/8661Wolfram Sang2009-12-174-0/+575
| |/
* | Merge branch 'for-33' of git://repo.or.cz/linux-kbuildLinus Torvalds2009-12-1790-401/+556
|\ \
| * | net: fix for utsrelease.h moving to generatedStephen Rothwell2009-12-121-1/+1
| * | gen_init_cpio: fixed fwrite warningMike Frysinger2009-12-121-1/+4
| * | kbuild: fix make clean after mismergeMichal Marek2009-12-121-1/+1
| * | kbuild: generate modules.builtinMichal Marek2009-12-127-5/+112
| * | genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()Jan Beulich2009-12-122-94/+99