diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 22:28:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 22:28:48 (GMT) |
| commit | 5d7e8af3c5727626b9e7f909c778b9ac9b4a1809 (patch) | |
| tree | 13d51e31ee070113538a6d26d9a52503ba4a3cd0 /kernel/perf_event.c | |
| parent | aa891f6b3f440402c6879ad1ecf332d318137422 (diff) | |
| parent | 79aa18d557bef02171da42ee928c23509e6ef4f7 (diff) | |
| download | linux-5d7e8af3c5727626b9e7f909c778b9ac9b4a1809.tar.xz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits)
MIPS: Malta: enable Cirrus FB console
MIPS: add CONFIG_VIRTUALIZATION for virtio support
MIPS: Implement __read_mostly
MIPS: ath79: add common WMAC device for AR913X based boards
MIPS: ath79: Add initial support for the Atheros AP81 reference board
MIPS: ath79: add common SPI controller device
SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
MIPS: ath79: add common GPIO buttons device
MIPS: ath79: add common watchdog device
MIPS: ath79: add common GPIO LEDs device
MIPS: ath79: add initial support for the Atheros PB44 reference board
MIPS: ath79: utilize the MIPS multi-machine support
MIPS: ath79: add GPIOLIB support
MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs
MIPS: jump label: Add MIPS support.
MIPS: Use WARN() in uasm for better diagnostics.
MIPS: Optimize TLB handlers for Octeon CPUs
MIPS: Add LDX and LWX instructions to uasm.
MIPS: Use BBIT instructions in TLB handlers
MIPS: Declare uasm bbit0 and bbit1 functions.
...
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions