summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/magic.h
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-3.8-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ja...Linus Torvalds2012-12-201-0/+1
|\
| * f2fs: add superblock and major in-memory structureJaegeuk Kim2012-12-111-0/+1
* | efivarfs: Add unique magic numberMatt Fleming2012-10-301-0/+1
|/
* UAPI: (Scripted) Disintegrate include/linuxDavid Howells2012-10-131-0/+72
OpenPOWER on IntegriCloud