diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-29 19:28:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-29 19:28:52 +0200 |
| commit | a61aef7fc00bac9068e98bf00aaa38e766f19a57 (patch) | |
| tree | 57ff3c0f8a1aef41321954ab1778cc27deb71058 /kernel/watchdog.c | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | mn10300: Use early_param() to parse "mem=" parameter (diff) | |
| download | linux-a61aef7fc00bac9068e98bf00aaa38e766f19a57.tar.xz linux-a61aef7fc00bac9068e98bf00aaa38e766f19a57.zip | |
Merge tag 'for-linus-20130628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300
Pull two MN10300 fixes from David Howells:
"The first fixes a problem with passing arrays rather than pointers to
get_user() where __typeof__ then wants to declare and initialise an
array variable which gcc doesn't like.
The second fixes a problem whereby putting mem=xxx into the kernel
command line causes init=xxx to get an incorrect value."
* tag 'for-linus-20130628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300:
mn10300: Use early_param() to parse "mem=" parameter
mn10300: Allow to pass array name to get_user()
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions