summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-0817-91/+9
|\
| * typo fixes: aera -> area, exntension -> extensionWang YanQing2011-12-091-1/+1
| * treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-025-5/+5
| * MIPS: Sibyte: drop select of SIBYTE_CFEPaul Bolle2011-11-131-1/+0
| * drop "select GCD" from three Kconfig filesPaul Bolle2011-11-131-1/+0
| * powerpc/mpc5121: drop "select MPC5121_ADS_CPLD"Paul Bolle2011-11-131-1/+0
| * Merge branch 'master' into for-nextJiri Kosina2011-11-133047-69949/+102014
| |\
| * | s390: drop "select HAVE_GET_USER_PAGES_FAST"Paul Bolle2011-11-131-1/+0
| * | powerpc/4xx: Fix typo 'PCC4xx_MSI'Paul Bolle2011-11-131-1/+1
| * | ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'Paul Bolle2011-11-021-1/+1
| * | Kconfig: remove a few puzzling commentsPaul Bolle2011-10-312-3/+1
| * | ARM: pxa: Fix typo 'CONFIG_BACKLIGHT_PWM__MODULE'Paul Bolle2011-10-311-1/+1
| * | powerpc: 4xx: remove commented out Kconfig entriesPaul Bolle2011-10-292-54/+0
| * | treewide: remove commented out Kconfig entriesPaul Bolle2011-10-293-20/+0
| * | h8300: drivers/serial/Kconfig was movedPaul Bolle2011-10-291-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
|\ \ \
| * | | x86: Kconfig: drop unknown symbol 'APM_MODULE'Paul Bolle2011-11-221-1/+1
* | | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-0834-114/+400
|\ \ \ \
| * \ \ \ Merge branch 'pm-domains' into pm-for-linusRafael J. Wysocki2011-12-2510-68/+400
| |\ \ \ \
| | * | | | PM / shmobile: Allow the A4R domain to be turned off at run timeRafael J. Wysocki2011-12-251-1/+28
| | * | | | PM / shmobile: Remove the stay_on flag from SH7372's PM domainsRafael J. Wysocki2011-12-252-23/+29
| | * | | | PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resumeRafael J. Wysocki2011-12-251-0/+1
| | * | | | PM / shmobile: Add support for the sh7372 A4S power domain / sleep modeMagnus Damm2011-12-256-31/+118
| | * | | | ARM: S3C64XX: Implement basic power domain supportMark Brown2011-12-094-3/+182
| | * | | | PM / shmobile: Use common always on power domain governorMark Brown2011-12-091-12/+2
| | * | | | PM / Domains: Make it possible to assign names to generic PM domainsRafael J. Wysocki2011-12-061-4/+12
| | * | | | PM / Domains: Add device stop governor function (v4)Rafael J. Wysocki2011-12-011-1/+3
| | * | | | PM / Domains: Make it possible to use per-device domain callbacksRafael J. Wysocki2011-12-011-4/+36
| * | | | | Merge branch 'pm-sleep' into pm-for-linusRafael J. Wysocki2011-12-2524-46/+0
| |\ \ \ \ \
| | * | | | | PM: Drop generic_subsys_pm_opsRafael J. Wysocki2011-12-211-1/+0
| | * | | | | Merge branch 'master' into pm-sleepRafael J. Wysocki2011-12-21194-731/+1406
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'pm-freezer' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Rafael J. Wysocki2011-11-2323-45/+0
| | |\ \ \ \ \ \
| | | * | | | | | freezer: remove now unused TIF_FREEZETejun Heo2011-11-2123-45/+0
* | | | | | | | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-0845-457/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | vfs: switch ->show_options() to struct dentry *Al Viro2012-01-061-2/+2
| | | | | | | | | |
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into ZAl Viro2012-01-0643-445/+42
| |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | fs: move code out of buffer.cAl Viro2012-01-031-1/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | consolidate a bunch of ipcbuf.h instancesAl Viro2012-01-0311-317/+11
| | * | | | | | | | | consolidate umode_t declarationsAl Viro2012-01-0317-96/+0
| | * | | | | | | | | switch spu_create(2) to use of SYSCALL_DEFINE4, make it use umode_tAl Viro2012-01-031-2/+2
| | * | | | | | | | | switch spufs guts to umode_tAl Viro2012-01-034-12/+12
| | * | | | | | | | | hypfs: umode_t noise and properly spelled S_ISDIR/S_ISREGAl Viro2012-01-031-5/+5
| | * | | | | | | | | switch debugfs to umode_tAl Viro2012-01-035-9/+9
| | * | | | | | | | | switch procfs to umode_t useAl Viro2012-01-031-1/+1
| | * | | | | | | | | switch device_get_devnode() and ->devnode() to umode_t *Al Viro2012-01-032-2/+2
| |/ / / / / / / / /
| * | | | | | | | | vfs: new helper - vfs_ustat()Al Viro2012-01-031-8/+1
| * | | | | | | | | vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_rootAl Viro2012-01-031-1/+1
| * | | | | | | | | vfs: fix the stupidity with i_dentry in inode destructorsAl Viro2012-01-031-1/+0
* | | | | | | | | | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-072-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ARM: prom.h: Fix build error by removing unneeded header fileFabio Estevam2012-01-041-1/+0