diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:57:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:57:50 -0700 |
| commit | 93b9e9a2d91b8a6c93f14e98382694f83de9f02e (patch) | |
| tree | 0344741b0dbac09aea7f289ad25f412923c9d165 /drivers/sbus/char/flash.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | Pull misc2-6-36 into release branch (diff) | |
| download | linux-dev-93b9e9a2d91b8a6c93f14e98382694f83de9f02e.tar.xz linux-dev-93b9e9a2d91b8a6c93f14e98382694f83de9f02e.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] increase ia64 static per cpu area
[IA64] Put ia64 config files on the Uwe Kleine-König diet
[IA64] perfmon: convert to unlocked_ioctl
[IA64] beautify vmlinux.lds.h
Diffstat (limited to 'drivers/sbus/char/flash.c')
0 files changed, 0 insertions, 0 deletions