diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 14:33:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 14:33:02 -0700 |
| commit | 9e897e13bd46fa03485468609741974259a8c573 (patch) | |
| tree | ebf95f236e95f074f0ad7a6f99d13e816f594f8a /arch/microblaze/kernel/heartbeat.c | |
| parent | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
| parent | MAINTAINERS: Update email address for bhalevy (diff) | |
| download | linux-dev-9e897e13bd46fa03485468609741974259a8c573.tar.xz linux-dev-9e897e13bd46fa03485468609741974259a8c573.zip | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull exofs updates from Boaz Harrosh:
"Trivial updates to exofs for 3.15-rc1
Just a few fixes sent by people"
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
MAINTAINERS: Update email address for bhalevy
fs: Mark functions as static in exofs/ore_raid.c
fs: Mark function as static in exofs/super.c
Diffstat (limited to 'arch/microblaze/kernel/heartbeat.c')
0 files changed, 0 insertions, 0 deletions