diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 20:48:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 20:48:36 +0100 |
| commit | 73c8e679aa8d123c1b05fa837daacd0aa0c4cb85 (patch) | |
| tree | f1f891b6c5997e83ebd75685c6532acc03de2392 /fs/xfs/xfs_trans_dquot.c | |
| parent | Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwa... (diff) | |
| parent | powerpc: Fix various issues with return to userspace (diff) | |
| download | linux-73c8e679aa8d123c1b05fa837daacd0aa0c4cb85.tar.xz linux-73c8e679aa8d123c1b05fa837daacd0aa0c4cb85.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
BenH says:
'Here are a few more powerpc bits for you. A stupid regression I
introduced with my previous commit to "fix" program check exceptions
(brown paper bag for me), fix the cpuidle default, a bug fix for
something that isn't strictly speaking a regression but some upstream
changes causes it to show in lockdep now while it didn't before, and
finally a trivial one for rusty to make his life easier later on
removing the old cpumask cruft. '
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix various issues with return to userspace
cpuidle: Default y on powerpc pSeries
powerpc: Fix program check handling when lockdep is enabled
powerpc: Remove references to cpu_*_map
Diffstat (limited to 'fs/xfs/xfs_trans_dquot.c')
0 files changed, 0 insertions, 0 deletions