Merge tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git] / fs / openpromfs / inode.c
Simple merge